Skip to content

[rhosdt] Fix stage tests branch parameter name for Gangway override - #80118

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
IshwarKanse:fix-stage-tests-branch-param
Jun 4, 2026
Merged

[rhosdt] Fix stage tests branch parameter name for Gangway override#80118
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
IshwarKanse:fix-stage-tests-branch-param

Conversation

@IshwarKanse

@IshwarKanse IshwarKanse commented Jun 4, 2026

Copy link
Copy Markdown
Member

Summary

Rename OTEL_TESTS_BRANCHMULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH and TEMPO_TESTS_BRANCHMULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH in the otel and tempo stage test ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to recognise a variable as an overridable parameter and inject values supplied via Gangway API pod_spec_options.envs into the step container. Without the prefix, ci-operator ignores the pod-level env var and the step receives an empty string, causing the runtime guard to fail with is not set.

Test plan

  • Stage jobs triggered via Gangway with MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH / MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH set clone the correct branch and run tests successfully
  • Stage jobs triggered without the branch variable fail immediately with a clear error

🤖 Generated with Claude Code

Summary by CodeRabbit

This PR fixes the stage test configuration for distributed tracing (OpenTelemetry and Tempo) by renaming environment variables to use the MULTISTAGE_PARAM_OVERRIDE_ prefix that ci-operator requires to recognize them as overridable parameters.

What changed:

  • Renamed OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH in OpenTelemetry stage test configuration and script
  • Renamed TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH in Tempo stage test configuration and script

Why it matters:
Without the MULTISTAGE_PARAM_OVERRIDE_ prefix, ci-operator ignores pod-level environment variables and the test steps receive empty strings instead. The prefix is necessary for Gangway API to properly inject branch override values from pod_spec_options.envs into the step containers. This fix enables the distributed tracing stage jobs to accept custom branch parameters when triggered via Gangway, allowing teams to test against different branches before merging.

Impact:
Distributed tracing stage jobs will now correctly receive branch override values from Gangway, and will immediately fail with a clear error message if the required branch variables are not provided, rather than proceeding with empty values.

…refix

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

This PR renames environment variables in distributed-tracing test stage configurations to follow a MULTISTAGE_PARAM_OVERRIDE_ naming convention. OpenTelemetry and Tempo test stages each update their YAML ref configurations and shell command scripts to use the new prefixed variable names with corresponding validation logic.

Changes

Distributed-Tracing Test Stage Parameter Naming

Layer / File(s) Summary
OpenTelemetry stage parameter override
ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-commands.sh, ci-operator/step-registry/distributed-tracing/tests/opentelemetry/stage/distributed-tracing-tests-opentelemetry-stage-ref.yaml
OpenTelemetry test stage replaces OTEL_TESTS_BRANCH with MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH in both the YAML configuration and shell script, with validation that the override variable is set before cloning and checking out the opentelemetry-operator repository.
Tempo stage parameter override
ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-commands.sh, ci-operator/step-registry/distributed-tracing/tests/tempo/stage/distributed-tracing-tests-tempo-stage-ref.yaml
Tempo test stage replaces TEMPO_TESTS_BRANCH with MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH in both the YAML configuration and shell script, applying the same validation pattern before cloning and checking out the tempo-operator repository.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~3 minutes

Suggested labels

lgtm, approved

Suggested reviewers

  • andreasgerstmayr
  • pavolloffay
🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and specifically describes the main change: renaming environment variables to fix the stage tests branch parameter naming for Gangway override functionality.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed Custom check for stable/deterministic Ginkgo test names is not applicable. PR modifies shell scripts and CI YAML configuration, not Ginkgo test code.
Test Structure And Quality ✅ Passed This PR contains no Ginkgo test code—it only modifies shell scripts and YAML configuration files for CI stage setup. The custom check is not applicable.
Microshift Test Compatibility ✅ Passed This PR modifies CI/CD infrastructure files (shell scripts and YAML configs) only, not Ginkgo e2e test code. The check is inapplicable as it targets new test additions.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR contains no Ginkgo e2e test additions, only CI infrastructure config changes (variable renaming in shell scripts and YAML). SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR modifies CI/operator configuration and shell scripts, not deployment manifests. No topology-related scheduling constraints are introduced.
Ote Binary Stdout Contract ✅ Passed PR modifies only CI configuration and shell setup scripts, not OTE binaries. OTE stdout contract check applies to OTE binary process-level code which is absent here.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PR modifies CI configuration files and environment variable setup scripts, not Ginkgo e2e tests. Custom check is only applicable when new Ginkgo e2e tests are added.
No-Weak-Crypto ✅ Passed PR contains only CI/CD configuration changes renaming environment variables; no weak cryptography, custom crypto implementations, or insecure secret comparisons present.
Container-Privileges ✅ Passed No privilege escalation configs found. PR only renames environment variables in ci-operator configs and scripts—no security context, privileged modes, or host access configurations are introduced.
No-Sensitive-Data-In-Logs ✅ Passed No sensitive data logging found. Error messages use constant strings without variable expansion, and branch names are not considered sensitive data.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@IshwarKanse

Copy link
Copy Markdown
Member Author

/pj-rehearse ack

@openshift-ci
openshift-ci Bot requested review from frzifus and pavolloffay June 4, 2026 17:37
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@IshwarKanse: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jun 4, 2026
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 4, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@IshwarKanse: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.21-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-ibm-p-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.21-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.16-ibm-z-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.12-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.20-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.19-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.12-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.14-arm-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-ibm-p-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.17-fips-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.19-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-grafana-tempo-operator-main-tempo-product-ocp-4.20-stage-tempo-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.17-fips-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.14-arm-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.16-ibm-z-stage-opentelemetry-stage-tests N/A periodic Registry content changed
periodic-ci-openshift-open-telemetry-opentelemetry-operator-main-opentelemetry-product-ocp-4.14-stage-opentelemetry-stage-tests N/A periodic Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

@IshwarKanse: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@etmurasaki

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 4, 2026
@openshift-ci

openshift-ci Bot commented Jun 4, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: etmurasaki, IshwarKanse

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot
openshift-merge-bot Bot merged commit 2df81f3 into openshift:main Jun 4, 2026
11 checks passed
TimurMP pushed a commit to TimurMP/release that referenced this pull request Jun 4, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
krisnababu pushed a commit to oharan2/release that referenced this pull request Jul 3, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
andrej1991 pushed a commit to andrej1991/release that referenced this pull request Jul 6, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
TimurMP pushed a commit to TimurMP/release that referenced this pull request Jul 8, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
SachinNinganure pushed a commit to SachinNinganure/release that referenced this pull request Jul 20, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
malingatembo pushed a commit to malingatembo/release that referenced this pull request Aug 5, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
TimurMP pushed a commit to TimurMP/release that referenced this pull request Sep 5, 2026
…refix (openshift#80118)

Rename OTEL_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_OTEL_TESTS_BRANCH
and TEMPO_TESTS_BRANCH to MULTISTAGE_PARAM_OVERRIDE_TEMPO_TESTS_BRANCH
in both ref YAMLs and command scripts.

The MULTISTAGE_PARAM_OVERRIDE_ prefix is required for ci-operator to
recognise the variable as an overridable parameter and inject values
passed via Gangway API pod_spec_options into the step container. Without
this prefix the pod-level env var is ignored by ci-operator and the step
receives an empty string, causing the runtime guard to fire.

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants